Merge changes I3394267d,Idf9ef20e into udc-qpr-dev am: f18305ac08 am: e50232a877

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

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