Merge "Rename android.util.TimestampedValue to android.os" am: 641fa6730a am: fee904a5fb

Change-Id: Ib439759dbee692a624491267d07f72b0d754779d