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

Change-Id: Ia339c87eba6924c9f61311c88ed14f049a4a08c9