Merge changes from topic "presubmit-am-48e8246e8960485fa279b808afc4be97" into sc-qpr1-dev am: 26e52aa02a am: 7a11a85e39

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

Change-Id: Ie2b3b01ec3ad57629f53ddd7568b5a2b318c13ab