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

Change-Id: I7b60d640763eb2c0fba975a885fe59be199f1813