[automerger skipped] Merge "Store elapsedRealtimeNs as int64 instead of long" am: dc51e5ef21 am: dbd03d7f3a
am: 07b359e818 -s ours
am skip reason: change_id I78e69e2c2ceb21a5748d9d5d860b45e5a3fae865 with SHA1 5a801c8b10 is in history

Change-Id: I0a4dbb3a356639d82aa5a51c7dd80d4afe3f7291