Merge changes from topic "presubmit-am-fedf8e29d01549d3ba055e82f0c35835" into...

Merge changes from topic "presubmit-am-fedf8e29d01549d3ba055e82f0c35835" into sc-qpr1-dev am: ba043b9e

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



Change-Id: I75c38102100330f8155bc8a7546357f15d8887bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>