Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS" am: 9709f513c1 am: 40d78c5b05

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000591

Change-Id: Ia931bb6390c9de4a2777a618ce40f5ce66ba3875