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

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

Change-Id: I33b8c65d8cee75c13dde9bf450a6c273176e0ae7