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

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

Change-Id: I4a3e0286a58efd79746c767f4e805410ce7fc93b