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

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



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