Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fb am: 0414c728 am: 27a94cf8 am: 941c874a am: afc24203 am: df5df55b am: d47a5156" into udc-d1-dev-plus-aosp am: 1618a6a2

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



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