Merge changes Idae0c3d8,I8c599912 into tm-qpr-dev am: 39768edb67

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

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