[automerger skipped] Revert "Replace system_ext container with system" am: 48b13e5c -s ours

am skip reason: Merged-In I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 with SHA-1 1337a88d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/32050770



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