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

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

Change-Id: I7a3d708119d2bf05cee4d9963559622171e1c3af