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

Change-Id: I4256e62cad4529fd8894505e41f9044188cd5805