Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into...

Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2 am: d1ea1184 am: bec17ff5 am: 7410b316

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

Change-Id: I27537e63764d7f8a2e7eb4d90e16f6fabc399c6f