Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
tree: 7656fcc7ab5c2b8e8bd6d2f9bb8dac1a1f499adc
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS