Merge "GD: Set non resolvable random address fix" into tm-dev am: dbb86c2e...

Merge "GD: Set non resolvable random address fix" into tm-dev am: dbb86c2e am: d1a85096 am: 28485185 am: 5b3c8b8b

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



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