Merge changes from topic "presubmit-am-bc6dc398754a48ff9df19cdb0af17ffc" into sc-mainline-prod am: 1d37a778

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

Change-Id: Ife3684e8712808b1f5e3d968971ff71f7f5b306a