[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3 am: d666af6990 am: 62eaabc324 am: d21fe3951a -s ours am: bb79edeabe -s ours

am skip reason: skipped by user smoreland

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

Change-Id: I8f306c86ebd3ae91e82c97a75f482b3f528e02e0