Merge changes from topic "presubmit-am-9775583256df468cab6420b6719fce49" into sc-qpr1-dev am: 761f529f

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

Change-Id: Ia7d52367db6c00f270cbfc83ce527623f0038557