Merge changes from topic "cherrypicker-L71800030001277565:N06200030020868453" into main am: b7a0491970

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

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