Merge changes I24580ea4,Id48b8eab am: cbc6a315c5

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

Change-Id: I3f90c94080e4d6f37cab3b5b43a0f5415fb50d8f
tree: 1618401e5cdf4fd4ac0b8ef7c78886beed884235
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING