Merge changes I90bf7957,If58524b0 am: 029ba17cb0 am: c3e38ade53 am: b08e5aba25

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

Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
tree: 7c22f7dc8c093d64ed7e6bc789aa9dae46be6a80
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING