Merge "Bluetooth 5 advertising duration refactoring (3/4)"
am: 9974e867a7

Change-Id: I1faff665b808eec646285ba462a3b92391f8c27a