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: I98064bcd035734e0b3fb1b896cd60a49f5abc0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>