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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I961ede20eb0156a601ec9b024baacc36445b6d5c