Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into...

Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into sc-qpr1-dev am: d1fc9720

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



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