Merge changes from topic "cherrypicker-L77300030007239273:N00600030116629593" into main am: aac9f819c4

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

Change-Id: Ic555109177e9b168117c4b4de64e926731a8bf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>