Merge changes from topic "presubmit-am-4dd661b2712141e4ad7e71f9634e6b14" into...

Merge changes from topic "presubmit-am-4dd661b2712141e4ad7e71f9634e6b14" into sc-v2-dev-plus-aosp am: 29fca375 am: a8a501dd

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

Change-Id: I66f3a294a4713e94e39f8cbfc2310b0df484f6b9