Merge "Fixes instant crash in WPP." into tm-qpr-dev am: 61a091b507 am: 2326338b46

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21148343

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