Merge "Fixing CloseGuard reported issue in WiredAccessoryObserver"