Merge "Merge "Correct comments/documentation" am: a2d5e8c2 am: 5a02fb8e"...

Merge "Merge "Correct comments/documentation" am: a2d5e8c2 am: 5a02fb8e" into rvc-dev-plus-aosp am: b1ac0342 am: b0c9152d

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

Change-Id: I537142c7417783e0633acde3eba6ca8a5c5a3642