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

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

Change-Id: I7d58c26cd3fc209b3c02bde1c28049793ea5bd97