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

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

Change-Id: I2e10702cee72d81da0564fb29f5fcddc465775c9