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

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

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



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