am a7d72dfd: Merge "Proper clean up when Ui test automation service is unregistered or dies."

# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'a7d72dfded3437e05c303dc40d61248022eb048b':
  Proper clean up when Ui test automation service is unregistered or dies.