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

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

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

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

Change-Id: I23385220b32e015420639a27daf73ddd99768c38