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

Merge "Merge "Fix the comments left on aosp/1481197" am: 464bc344 am: 3a37cb65" into rvc-d1-dev-plus-aosp am: b555276d

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

Change-Id: I583b1b7dd5ab13a35c41b76f1425f15b5a3117bf