Merge changes from topic "am-7a2ccf4a1ceb4ffb986cdbed5ae128f1" into main am: 33dc202b -s ours

am skip reason: Merged-In If05d11a0a884294896223aedd79d7f689380dc58 with SHA-1 06f58c06 is already in history

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



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