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

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



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