[automerger skipped] Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e399
am: badb14fdb1
-s ours
am skip reason: Merged-In I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 with SHA-1 1337a88d11
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3463347
Change-Id: I7eb2d23e6c01d6b91a61319c16eebb194388eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: