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 am: b02df1ad

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



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