Merge "Bluetooth 5 advertising duration refactoring (2/4)" am: 1b14e03289 am: d1169df562
am: 04ecb1a92b

Change-Id: I53b00116bd7f6deec7cdff8c24f512334832eee1