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: 49de6468 am: ded8837c

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



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