Merge "Fail the case if battery status doesn't change in time to avoid triggering system update" am: e5e010e3f4 am: 3300cd4d9f

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

Change-Id: Ife9556f728ed635a92dab1595173c181fb98d34a