Merge "Use elapsed time as timestamp of activity launch" into sc-dev am: f192f080 am: 002bd884 am: aaedcc44

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

Change-Id: Ib03ff0779fbefaf9783bf46af69dad1bef260bcd