Merge "Remove unused references to android.app.ActivityThread in BluetoothAdapter" am: 202ab8ff95 am: e768d3d44a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920977

Change-Id: I5b0796c098f9f86d41f9afae1d82bbdcd84afced