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

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



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