Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev am: 45894db9d5

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

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