[automerger skipped] Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d77b am: ecab80fe20 am: f905585fa7 -s ours
am skip reason: Merged-In I5a54b44294021d64d8506eeb570db0db8544472a with SHA-1 48ea66f50f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964907
Change-Id: I4238e80bc604632bd62024f034617bdbbc334cc9
This commit is contained in: