Merge "Merge "BatteryStatsValidationTest:Reduce waiting time for bluetooth enable." into android10-tests-dev am: f7eba907bd" into android11-tests-dev