am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev
am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev

* commit 'fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
  edits to the Lollipop highlights

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