Merge "Out of Band Pairing features" am: 734a196b58

Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2029803

Change-Id: I2bc9c667dad71dbdf36b3d500048cb8435612bf6