Merge "Removing some unused container IDs" into tm-qpr-dev am: eae7e58b

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



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