Merge changes from topic "presubmit-am-91774b822616430495e3cd353411036e" into...

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

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

Change-Id: I3168638e1091da3a7011e310d6b008d7b6fd698c