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

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

Change-Id: Ib978b5804dc92f698fdd7f12a0c9373549f76061