Merge "Merge "Cast binder data type to uint64_t in high bits test" am: 3c80f17536 am: 2ca989096e am: 825e67f1d4" into oc-dr1-dev-plus-aosp