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

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

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



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