Merge "Re-enabling testShortcutIconWithTheme" into tm-qpr-dev am: 2825d06382

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

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