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

Change-Id: I8ddff2647dacaf6efbe347e1e084d85cd1fdb607