Merge "Fix a compatibility issue: getBigUint64." am: 74232e7a3f

Original change: https://android-review.googlesource.com/c/platform/development/+/1781348

Change-Id: I5299018a9d5d01fc02693d749af9646f54c0da41