Merge changes from topic "am-26e1961d8df14d378ce17a6da36888df" into...

Merge changes from topic "am-26e1961d8df14d378ce17a6da36888df" into tm-qpr-dev-plus-aosp am: aa53b559 -s ours

am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e3 is already in history

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



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