Merge "Revert "Allow simultaneous LE Observe and BTM Inquiry/Scan""