Merge changes I35fe528b,Ia612c1b5 into udc-dev am: 0b53332c31 am: a19557f046 am: 6c4f41c44a am: 49911f58a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22419061 Change-Id: I77c7211ec6b87c7144865e831b2e24e6b9e111da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: