[automerger skipped] Merge "Adds some HAP feature related methods as system...

[automerger skipped] Merge "Adds some HAP feature related methods as system API" am: 8b44b3f9 am: 367b7e85 am: bb28e744 -s ours

am skip reason: skipped by user angelala

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2255717



Change-Id: I81e377ae9788640518534a9bcd78aab758bc1182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>