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

[automerger skipped] Merge "Add preinstalled partition to seinfo" into main am: 5c4b8708 am: dde0e766 -s ours am: 1d6c954e -s ours

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

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



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