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

Merge changes from topic "presubmit-am-e66c48d6d2b243a19c98c41886727753" into sc-v2-dev-plus-aosp am: d58e49b5

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

Change-Id: I64ffc2a08b8a02a5dc3a39ce559458467f379260