[automerger skipped] Merge "Fix the comments from aosp/1717479." into sc-dev...

[automerger skipped] Merge "Fix the comments from aosp/1717479." into sc-dev am: e39eddca -s ours am: dcd34962 -s ours

am skip reason: Merged-In I71ebdd011574bd96de16a4248b0e15636418e87c with SHA-1 40694249 is already in history

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

Change-Id: I34e0c1754f585b101e02a2edc510bd4c070979a5