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

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

Change-Id: Ie7e707afc4514d11740d258c425bd9c1a7896fb4