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

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

Change-Id: I081a73e63da2619df27b24b1f1d98e716b552a34
Signed-off-by: Automerger Merge Worker <[email protected]>