[automerger skipped] Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d7 am: ecab80fe am: f905585f -s ours am: 6abb0d8d -s ours

am skip reason: Merged-In I5a54b44294021d64d8506eeb570db0db8544472a with SHA-1 48ea66f5 is already in history

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

Change-Id: I265a07327e2b1ecc2303397888d78adac0eeb9d6