Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into...

Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-mainline-prod am: 35b4aafc am: 205b69c4 am: beaf0d6e am: 79b2c07c

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



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