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

am skip reason: skipped by user smoreland

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

Change-Id: I144943767439f3207979fbf6073a22e5e7a60055