Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7 am: 41d68e4f4a

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

Change-Id: Ia10fe44c45f5dbaea808025210b7a287209b85dc
tree: 67e60384ae731ccf2b33664fa6d41043cb8fb264
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING