Merge "Fix IllegalStateException when A2DP connects before boot completes."