Merge changes from topic "presubmit-am-bc6dc398754a48ff9df19cdb0af17ffc" into sc-dev-plus-aosp am: d1975869 am: 7d800bc9

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

Change-Id: I408b52098b113c341ecd465d4b487b0ae93c1812