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

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

Change-Id: Iefb07ae46a42b5ad751298470e11ec2c94716e37