Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-qpr1-dev am: 98071983 am: 792280e2 am: 7aa9747a am: 2fa354e4" into tm-d1-dev-plus-aosp am: 0f22693f

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



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