Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into sc-qpr1-dev am: 71c70281 am: 6b8df71f

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

Change-Id: I4985cae4888d236d82a1998ae1dd2bbdeb374387