[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: b2f02129 -s ours am: b6430ab9 -s ours am: 6bffcabc -s ours

am skip reason: Merged-In I6541f7d49cb932c85374bf9acf777038b888e873 with SHA-1 584cde2e is already in history

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



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