Merge "Revert "Fix cts failures of BT Le PeriodicAdvertising Test"" into stage-aosp-tm-ts-dev