Merge "Add support to disable 'Ambient Display' in sensor tests. b/18033539" into lmp-dev