Merge "Correct comments" am: 2c0b1b672e

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

Change-Id: I3bc94fb7cbc33dc32bb4b0adf5282814bac75232