Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26

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

Change-Id: Idde2a848c60bef8be4bc253ed77556bdd24ae20c