Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into...

Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into sc-qpr1-dev am: b76e82c4 am: 1fe5398d am: cee425e0

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

Change-Id: I709e542f97dfdea77788ba19a1ff2e5ea3253ebc