Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev