Merge changes from topic "presubmit-am-6eb6cc390f284836ade6930c3dc57a3a" into sc-qpr1-dev am: 01e24d30 am: a549afe0

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

Change-Id: I22ea50897dd7dcc036636c86f53201677b5c6a14