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

am skip reason: skipped by user smoreland

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

Change-Id: I7231522436c89fe75b0d96bd1c704545cef38bd9