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

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

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



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