Merge changes from topic "presubmit-am-8d82581c75db40948a1ed7924f5762d5" into...

Merge changes from topic "presubmit-am-8d82581c75db40948a1ed7924f5762d5" into sc-v2-dev-plus-aosp am: c69fe213

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



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