Merge changes from topic "presubmit-am-0ba418188bf14da5b3177de2f43d7187" into...

Merge changes from topic "presubmit-am-0ba418188bf14da5b3177de2f43d7187" into sc-qpr1-dev am: db5a6ff1 am: b21454d8 am: fa6ab991

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

Change-Id: I8e9e6cbf720573fb26156445bdf9dc931f08f2b3