Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-b1e78f9adaeb496da178ba91df448585" into tm-qpr-dev-plus-aosp am: 7e39707f" into udc-dev am: 0afff725

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



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