[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: 8cec5215 -s ours am: 993b1603 -s ours

am skip reason: skipped by user smoreland

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

Change-Id: I98a5f9bb0bc2492e3e1138abbb297eaf3f48fd9c