Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into...

Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-qpr1-dev am: 98071983 am: 792280e2 am: 7aa9747a am: 2fa354e4

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



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