Merge changes from topic "presubmit-am-4bb5dba41f984ec1ad67ebf208ade6f8" into sc-qpr1-dev am: 82514378 am: 74570617

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

Change-Id: I059aa2ed1f1359484ab57c3782feb1b1757d327c