Merge "Fix potential overflow of launch event uptime" into sc-dev am: 90b85f3e am: 0611f4bc am: 8c2e06e3

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

Change-Id: I10b913bf3cc399bd62d9dca5a05391d893d6d928