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

[automerger skipped] Merge "Revert "Replace system_ext container with system"" into main am: e239718b am: b7ea931a -s ours

am skip reason: Merged-In I92387e6d5764c750f83bd8d266f6da969e114a72 with SHA-1 da76a663 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3464481



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