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

Change-Id: I2b996ce0e0cf48f6f2935e37602a9805ab52eea4