Merge "CurrentTimeMillisLong: Move to framework-annotations"