Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a51d

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

Change-Id: If93dfeab89c644f67001c144253a594996c96eef
tree: 7bdb0268715d404d47107c2ce59f64e7d2a70d03
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING