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

* commit '9fbbeb5aa5144e2df6158973b18cb804604109c1':
  Add support to disable 'Ambient Display' in sensor tests. b/18033539