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

Merge changes from topic "am-c399be4a96434da5bf4e1c28f8fd167d" into tm-d1-dev-plus-aosp am: ba543b21

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



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