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

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

Change-Id: I29825e05bac8196dccbe26844118697a277d91b0