Merge "Switch GATT scan timekeeping to use a different clock" am: fd12816a6e am: beb868d127 am: ef3763a9cb
am: a9b1271807

Change-Id: Iddf74499c27981a6d3c2bcb11da09141b54750ea