Merge changes from topic "am-e32d35e3d2634480a5b87af5e15839c4" into...

Merge changes from topic "am-e32d35e3d2634480a5b87af5e15839c4" into tm-d1-dev-plus-aosp am: bd741231 -s ours

am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 4bdb5f98 is already in history

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



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