[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f...

[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f am: 17aa765f am: d666af69 am: 62eaabc3 am: d21fe395 -s ours am: bb79edea -s ours am: cb9fcb9d -s ours am: 0d88e70f -s ours

am skip reason: skipped by user smoreland

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

Change-Id: I2f717a64ea8b1e0ab85917498551cd7c3618356c