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

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



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