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

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

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

Change-Id: I079ea3eb1102128d7a4059008884b5f15ed85b08