Merge "Excludes unexpected set service state intent" am: 0fa85acbc0 am: 5bc7141165

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

Change-Id: Icf8c5b0d0888021d31bfb37cceec652d0473278c