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

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

Change-Id: Ib2e718f45ed0087ddd7b990fd7c1d8ede1fb62a5