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

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

Change-Id: I24077cd5a3e5563595fec95052b608599dbec9d2