Merge "Not using calculator from test" into tm-qpr-dev am: adf526ab

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



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