Merge "Fix potential overflow of launch event uptime" into sc-dev am: 90b85f3e am: 4cc4b538 am: 54cd6d70

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

Change-Id: I1835787bd83770ba8d0f650fabfd512c69d8651e