Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev