Merge changes from topic "am-cd836c23dec34f5dbbebac81430a8b63" into main am: cdad60ca -s ours

am skip reason: Merged-In I48ba228a258e56fb9db92dadb33339f52183242a with SHA-1 f19b45e1 is already in history

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



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