Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into...

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

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

Change-Id: I75902b39cef256f27930e394397e9e92aca9d653