Merge "Convert advertising HAL from struct into class (1/3)" am: 68669afe4d am: 184e0b88f0 am: 71c190fa64
am: 628d0a09ce

Change-Id: Iad2aaba5700f26ee278deeadd5e81643dc125d24