Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe7 am: b6619256

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

Change-Id: I3b61ec1023f7b1264b064932c94a6213d2459bdb