Merge "Fix the comments left on aosp/1481197" am: 90a764cd5b

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

Change-Id: I7f13f380db5fe30e67be9cedc9429519b9fd4b6e
tree: c0c21f3e3dab269615c49ee0af0ffeb360f12b08
  1. core/
  2. services/
  3. tests/