Merge "Add GD hci & controller init flags" am: ea8d2ebac3 am: dbb1d67fd9

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

Change-Id: Ida28d6a280282509dbff5ba61e3ae62347196e3b