Merge changes from topic "am-27c72360a39d43d190fa3a0d32215f14" into main am: 18b94538 -s ours

am skip reason: Merged-In I46242145bc8b1b0170673c0c2dde13f01af71e29 with SHA-1 7d6574e6 is already in history

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



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