Merge changes from topic "adv_logger_aosp" am: 90a85aea

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



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