Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8 am: fc3c9d0e9e
am: c162879c6a

Change-Id: I61382d466f28311b8ba5dd4ab120747eb0708501