[automerger skipped] Merge changes from topic "227137943" am: 2f48177c am: 945d15b1 -s ours

am skip reason: Merged-In I00ced32a26fd1af7bc8cc23749d92ae90d5a5a0f with SHA-1 1b463332 is already in history

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



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