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

* commit 'dd12420e273b0dfc8f836e1c64562ac2494d7cc1':
  Shut down UiAutomationConnection without a lock held