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

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

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



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