[automerger skipped] Merge "Fix the NPE in the tryToFetchUsageData() method"...

[automerger skipped] Merge "Fix the NPE in the tryToFetchUsageData() method" into main am: 250101cd am: 3464d757 -s ours

am skip reason: Merged-In I4167becf373a6279135261bbaff44ef0888728fa with SHA-1 291e92d6 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3424441



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