Merge "Bypass cellular battery stats test if telephony is not supported" am: 1c603e7ec3 am: d347dad799 am: 2a00b80275

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796589

Change-Id: If897470505f6baa44d70e6f3d2758d9ab2969bec