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

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



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