am b8568e11: (-s ours) am df3a7f62: Merge "DO NOT MERGE SensorBatching CTS...
am b8568e11: (-s ours) am df3a7f62: Merge "DO NOT MERGE SensorBatching CTS test, add wakelock and increase timeouts" into klp-modular-dev
* commit 'b8568e11':
DO NOT MERGE SensorBatching CTS test, add wakelock and increase timeouts