Merge changes from topic "cherrypicker-L60200030001118132:N13600030018110596" into main am: 7522c845e5

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

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