Merge changes from topic "am-70d7c5523393494f9738846a0863736f" into main am: 2536ea06 -s ours

am skip reason: Merged-In I8aed84fab3b5f12e781f3834a087e186c6f61cca with SHA-1 98332a78 is already in history

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



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