[automerger skipped] Add support for NRPAs in advertisement sets am:...

[automerger skipped] Add support for NRPAs in advertisement sets am: 5d810081 -s ours am: 510e79be -s ours

am skip reason: Merged-In I51550c1b6c76412975e8cdcac9eca1ba3ad53a67 with SHA-1 5c715054 is already in history

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



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