Merge "Bluetooth 5 periodic scan (3/3)" am: e077d6fa76
am: e5a2eafaff

Change-Id: Ib53ef8eee0df8aa743b54731372b280bebfd0ceb