Merge "[FUI26] Address comments on aosp/1560408" am: 8f03f1e788 am: e5929c073c am: 13bcaf5446

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

Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73
tree: d280b6ac5bc3e32ce5a8eb9b5503c7ba2a86cc28
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING