Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: 59e069bbde

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c437476b2891d327e3e29e3979b0dcd4e30b52d
tree: a90054dabd1bce833fdc1866791e425e55ffc240
  1. core/
  2. services/
  3. tests/
  4. OWNERS