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

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

Change-Id: I45b3f173c53e90ae25cee91df1177674a4894cb8