Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-309bd698bce64ba688b2d3e351e12ef1" into tm-qpr-dev-plus-aosp am: 9617844c" into udc-dev-plus-aosp am: 1213ada8

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



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