Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-qpr1-dev am: 0dc764cb am: 2c3b6005

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

Change-Id: Ib75b7c7247c11a519f5b10a3a81f67cabadbc56a