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

Change-Id: I075474969edaaefc03bb4174332ce125ebf26a53