[automerger skipped] Merge "Add preinstalled partition to seinfo" into...

[automerger skipped] Merge "Add preinstalled partition to seinfo" into udc-dev-plus-aosp am: a2163dc8 am: dd6680b6 am: 7679a1cc -s ours

am skip reason: Merged-In I0b407ad8b95278453d5b917e0da7024b245062b9 with SHA-1 8bbec9ac is already in history

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



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