Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into...

Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: acb233aa am: 9a60608c

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



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