Merge changes from topic "presubmit-am-6b5c425facc641d0ab518d714178721f" into...

Merge changes from topic "presubmit-am-6b5c425facc641d0ab518d714178721f" into sc-v2-dev-plus-aosp am: bca39058

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

Change-Id: I044d51931fe5b00281d5d368a86dac5d02497e01