[automerger skipped] Merge "Revert "Replace system_ext container with system""...

[automerger skipped] Merge "Revert "Replace system_ext container with system"" into main am: 9b828add am: 12ec892c -s ours

am skip reason: Merged-In Ib3a533493060948035c393e83a1a260fdc380624 with SHA-1 c7b54294 is already in history

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



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