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

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

Change-Id: I918959fb2f19b339b7713146228d654eaab5a776