Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d am: dc08329ee9

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

Change-Id: I4738114f56e53db4424671e7034a5d7a03375c1a