Merge "Avoid IllegalArgumentException when bluetooth is disabled"
am: 2a1bdd2429

Change-Id: I536b4ca701bed102c5c2914a6dbfa2393a646c6d