Merge changes from topic "presubmit-am-0adaeb1d15a7491689c8c569dbba8db2" into sc-qpr1-dev am: f86c8c5d am: bf566c0f am: 2c271d30

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

Change-Id: I16145c2181b89f5862a6b0a49cee1df016444cee