[automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev...

[automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b am: 5fac3861 -s ours

am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 47430c08 is in history

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

Change-Id: Id1daa71837a053de33bd28b18b435f6f719e44fd