Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev am: 8b9ef48f

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

Change-Id: I03f85aef4050a5a774654406a58e870f59fba4d7