Merge "Change getAgeMillis to use elapsed system time instead of wall-clock time."