Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e am: 010f29032c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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