Merge changes I3ba50cbd,I970ee365 into sc-dev am: 458a60dab5

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

Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
tree: 0d704a6cebbf498b1ee3b6bdae06ffdac0883c85
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING