Merge "Update clock whenever AoD unpauses"