Merge "Cherrypick needed for merge conflict with ag/18875278" into tm-qpr-dev am: 9ffbbf8f

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



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