Merge changes Ic2357dcf,Iddf8c71a am: 514e8ad39c

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

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
tree: 447d8ff2cc21e92cc88326b67408e9d6270fa657
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING