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

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



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