Merge "rusty-gd: Add missing GAP data types and fix EIR length" am: f4e304e1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1593171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3532021f388b15c9b82153d3bc052b2bde5a61b