Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: d3f0fad1f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151 Change-Id: I6ec2c3be10d24937d71e8e69b979d72c09104633 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: