Merge changes from topic "am-98e86c5bacee4ac184d43f19e6155ab6" into...

Merge changes from topic "am-98e86c5bacee4ac184d43f19e6155ab6" into tm-d1-dev-plus-aosp am: 7293379b -s ours

am skip reason: Merged-In I68f2f37b5ce835e7fd8649b382eaee9fc299ec79 with SHA-1 c5e8f7f5 is already in history

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



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