Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into...

Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 6ab63e6a

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



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