Merge changes from topic "presubmit-am-902b4a010a85419caf0dc4cf949d2c72" into sc-qpr1-dev am: c056ea0d am: eca02502

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

Change-Id: I0d9e199fb40137dbd8129aeffb5cd48c564902e9