Merge "Correct comments" am: 2c0b1b672e am: d6b4b6dc69

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

Change-Id: I594aaa568ba6743b45ab665f8e3e5dbb357f8323