Merge changes Iac9487e8,Ifa411c7b am: 999506022f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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