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

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

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



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