legacy: Co-locate le address and le address types am: 4c715a22 am:...

legacy: Co-locate le address and le address types am: 4c715a22 am: 355ff426 am: 8b99434f am: 93566636

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

Change-Id: I25f38ac152fb8d9c083f11cb972dc253a3503b0f