Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into tm-dev am: f050a9b0 am: adeb1878" into tm-d1-dev-plus-aosp am: 8ff6afab

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



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