Merge "[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3 am: d666af6990 am: 62eaabc324 am: 8cec52154e -s ours am: 993b1603d4 -s ours am: a4eac5db0b -s ours" into sc-qpr1-dev-plus-aosp