Merge "Fix the comments left on aosp/1481197" am: 464bc344a5

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

Change-Id: I7f13f380db5fe30e67be9cedc9429519b9fd4b6e