[automerger skipped] Merge "Fall back to Wi-Fi data display in data usage...
[automerger skipped] Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev am: 220a6a00
am: d19ca38e -s ours
Change-Id: I763e60a281843dd7766b9aff582ca117565931a7