Merge changes I1136ede4,I5f0877fe into udc-dev am: 106d91d04c am: c603ba7118
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23251138 Change-Id: I05f74c2acb7e8a758156677ae7485408ddc43d6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: