Merge "[BT] Fix PTS TG/MCN/CB/BV-04-I&BI-02-C fail" am: 02d3e492f1

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

Change-Id: I55f209eb6de6c90317fb9bd5c52a9423f3a00bb6