Merge "Cast binder data type to uint64_t in high bits test am: 7e04edd5 -s ours am: e00edc7c" into oc-dr1-dev-plus-aosp