Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64 am: 1505fe6152 am: 12bbf1915e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3fe087370d66482d7699d569b32e364900f6dc3
tree: bf8e8d6fc1b4ada5bab8276e44a7debe4d9e2b61
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS