[automerger skipped] Merge "Set the timestamp of dex2oat metrics to SystemClock.uptimeMillis()" am: 0520140984 am: 6334f513dc -s ours am: bab0cad37d -s ours
am skip reason: Merged-In I3a0946b4e2bba32db3c972a871bbd2519d1d70c3 with SHA-1 4c75ae6c23 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1744819
Change-Id: I473e754005134f393bdee19e0784bc5d0694af61
This commit is contained in: