Merge changes Ifa2aa335,I09366a7f am: 7fed667205 am: 1700ac64d3 am: 61074fe878

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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