Call the correct advertising and scanning API. am: d18c06ea am: 00f5a06e am: 9549d8cf

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



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