Merge "Resolve NPE in getConnectionState()" am: db28c9ef12 am: 82bc96e9bf

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1596936

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ec01ff6e30ac8bfd1cd9ce7f57558615c0864be