Merge changes from topic "presubmit-am-bc6dc398754a48ff9df19cdb0af17ffc" into sc-qpr1-dev am: bc965906 am: b5b508f5

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

Change-Id: I529b0f9f9563b7ebe1875132f6dd8f58a4727aee