Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev am: 2cef335b5b
am: b4c55b62a5

Change-Id: Ie247afa90811c4ffb24179fba63fd71cb8fc6426