[automerger skipped] Merge "[MS68.3] Address comments at aosp/1958144" am: 0cc12cf02d am: 4227d88049 am: a9c7891963 -s ours

am skip reason: Merged-In I5a54b44294021d64d8506eeb570db0db8544472a with SHA-1 250b1e31d6 is already in history

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

Change-Id: I4238e80bc604632bd62024f034617bdbbc334cc9