Merge changes from topic "am-423100f2fa964251aaa876d970750ef5" into...

Merge changes from topic "am-423100f2fa964251aaa876d970750ef5" into tm-dev-plus-aosp am: 5f1cd938 -s ours

am skip reason: Merged-In I5241086c947a4227fb32648f0693303be66f4d46 with SHA-1 52e2733e is already in history

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



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