Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-qpr1-dev am: 1eb694a2

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

Change-Id: Ib18f4eadc67bdac22b21add703e3f8875a845bd0