am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev

* commit '258e630a6bc876c57ac97c6da3e5414d0e7eb036':
  Shut down UiAutomationConnection without a lock held