[automerger skipped] Update Barring HAL Structures to nest single-use unions/structs am: 218ea408e3 am: f3f4904a62 -s ours am: 40d892e625 -s ours am: 5abdfdd35d -s ours am: 85a89bbbe1 -s ours

am skip reason: Change-Id I8a8e734011909b038c0d735c2bfde7ea773b71e6 with SHA-1 24c3416b4f is in history

Change-Id: I1eed4eaf07bb8dbee39fc50632052f24fd5fc484