Merge "Address comments from aosp/1298476" am: 6dc9a28b88

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

Change-Id: I3c7c0ef738b6c6b964dc91c593cbf2b6166e3843
tree: 94a77cc937898087a9bc2b600d62ab0c0dfca448
  1. core/
  2. services/
  3. tests/