Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS" am: 9709f513c1

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

Change-Id: Id203866cc123209ac5a7c68f8b4822953fde307e