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

Change-Id: Ib8e53386754ccfec27314bc1d29aaabde0cb7976