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

Merge changes from topic "presubmit-am-cdfb8b44630c469d9cf670ce26ca429f" into sc-v2-dev-plus-aosp am: 252b5380 am: 36e9981c am: fbf874cd

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

Change-Id: I167daf752fdeae43666812cc087ffe556c8001c4