[automerger skipped] Merge "Bypass cellular battery stats test if telephony is not supported" into sc-v2-dev am: 3a7b8f1e2b -s ours

am skip reason: Merged-In I9ddc1da2a3f83f3fd2ab59059185f2f7a8d08701 with SHA-1 1e49ed0e84 is already in history

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

Change-Id: I2b0e41a0f5bb7cb06f2c04cd7baa100c8f63d81c