Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4 am: 50ccf0437f

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

Change-Id: I3193cf144d0328d832aa43e626a76c34c02c1e2a