[automerger skipped] Merge "Rename android.util.TimestampedValue to android.os" am: 641fa673 am: fee904a5 am: aa58c0d5 -s ours
am skip reason: Change-Id I4b84db03c8ad24bbef63e45d6d15fb306a10364e with SHA-1 d159015e is in history
Change-Id: Ia0df0d190d348802d872e4625ec6c761d5b2697c