Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-qpr1-dev am: 9b4d98a5 am: d856b73e

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

Change-Id: I366fffd2ba7b74d86d894c17f97b6dd34045d91c