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

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

Change-Id: I7ac345518e30dcc8cb7929e89518ab6b160b3442