[automerger skipped] Merge "Add preinstalled partition to seinfo" into main am: 5c4b87083d am: dde0e76639 -s ours am: 1d6c954e96 -s ours am: 8cc7271da9 -s ours
am skip reason: Merged-In I0b407ad8b95278453d5b917e0da7024b245062b9 with SHA-1 d2f1a64991 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670836
Change-Id: I0223a9b4215eba9391bc18d134d1eee7d66233f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: