Merge "Avoid trigger Battery test when there is no battery" into pie-cts-dev am: e8995fddeb am: fb1e00b8b1 am: 85bb54f0c7 am: 3843e86e53

Original change: https://android-review.googlesource.com/c/platform/cts/+/1414049

Change-Id: I697c573306c5cef35359bc1dae315437271d1ac7