Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into...

Merge changes from topic "presubmit-am-58d727f812d04fc3b6d1823862f6bf2f" into sc-qpr1-dev am: 3181e42d

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

Change-Id: I82dc0a52ba5b0c7c3618bb7460642d8320a9eb3a