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

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

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

Change-Id: I9f4d10dd7cce2d431505a175084d1c2e9dd3d449