Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32

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

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