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

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

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



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