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

Change-Id: Id5e1030853d62ac095da7afc3968bd16ca9aa6c4