Merge "Adjust flaky batterystats wakelock assertions" into pie-cts-dev am: 11d2c821f2

Change-Id: Ia11a85d7844e035d75125a8338985645c26f5d5f