Merge "Address comments from aosp/1298476" am: 48fbda02b0 am: 76d4f3513f

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

Change-Id: I7b119758ac7cd65defdec77692957287af17566d
tree: fc8bed55fcdf53b5b1ecd615d1d772502d9d5df4
  1. core/
  2. services/
  3. tests/