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 am: 1bc4f3c7

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

Change-Id: I18a1e42198fc6febc3d88e740f6750b046def0c0