AI 146341: g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)   BUG=1675368
AI 146341: g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)
  BUG=1675368

Automated import of CL 146341

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base