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

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

Change-Id: Idcfc40762221d456374fdf7ee3f96123a137a793