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

Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into sc-mainline-prod am: b4752794

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



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