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

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

Change-Id: Iea77eb0ed2ca0b5603d1257496bd1e8a14ed0d77