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

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

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