Merge "Fix a crash on the lock screen wallet icon." into tm-dev am: 334d03f4...

Merge "Fix a crash on the lock screen wallet icon." into tm-dev am: 334d03f4 am: 5581b4bb am: e4271832

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



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