Merge "[automerger skipped] libbinder: uptimeMillis returns int64_t! am:...

Merge "[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f am: 17aa765f am: d666af69 am: 62eaabc3 am: 8cec5215 -s ours am: 993b1603 -s ours am: a4eac5db -s ours" into sc-qpr1-dev-plus-aosp am: 8e09d2d7

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

Change-Id: Ib0b22f70687480bde1fa9d4fa432f5b16b825b27