Merge changes from topic "presubmit-am-f13c035a5b3e49f48c5507317e3c0aaf" into sc-qpr1-dev am: cb8556cb78

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

Change-Id: I1873e9bdfe666943ddf358ea648a40431f56aed1