gd: Re-include assorted files am: 5b373155 am: 246bccb2 am: b4866d12

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



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