Merge changes Ie8d98359,I4d5cadfd am: 63383e755e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
tree: 84082e2719232ecffb5dda9840e90067070115ca
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS