Merge changes from topic "am-c3f1c6e2a7eb490898bc4752089e1768" into main am: 83f98cac -s ours

am skip reason: Merged-In Ifd7275881a387b98d6225bc8568c8ee2f81dca70 with SHA-1 b5093407 is already in history

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



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