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

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

Change-Id: I0758a4e38d349ffe01d8e1fd78c5b6337cdb9242