[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp am: e70eb23c -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb is already in history

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



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