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

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



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