Merge "DO NOT MERGE SensorBatching CTS test, add wakelock and increase timeouts" into klp-modular-dev