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

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

Change-Id: If5628d2529796fc6878f50c38b2fab8114628933