Merge "QR Code Scanner tile says "Updating" when GMSCORE is updating" into tm-qpr-dev am: afd9d50f8b am: 9d18bcbc52

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20489494

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