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

Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev am: 40b5a52b

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



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