Merge changes from topic "presubmit-am-28395e19f737446e92e70dc9b28f2424" into...

Merge changes from topic "presubmit-am-28395e19f737446e92e70dc9b28f2424" into sc-v2-dev-plus-aosp am: 8d96a381 am: 39bc3023

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



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