Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad8 am: 0f36e3a1

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

Change-Id: Icc5c6b19acaa1462110b5f0ec88bf6f4166962a9