Merge "Revert "Replace system_ext container with system"" into main am: e239718b4e

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

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