Merge "Get device type using adv flag data" am: 3c0408ab am: 51f551c7 am:...

Merge "Get device type using adv flag data" am: 3c0408ab am: 51f551c7 am: 7f2c6c6e am: 1e1bd809

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



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