Merge changes from topic "presubmit-am-8b6dfaa3bb7b442692d25e9419636880"

* changes:
  [automerge] Fix AIDL sensors VTS test 2p: e9cb2933a4 2p: bfd33253e9
  [automerge] Fix AIDL sensors VTS test 2p: e9cb2933a4
  Fix AIDL sensors VTS test