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

Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into sc-v2-dev-plus-aosp am: 85162b65

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

Change-Id: Iab47a68e04c6db84708998e35cac91d30fe136f2