[automerger skipped] Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of am: 3f22cb1106 am: 612b33fa9a am: be67bbad65 -s ours

am skip reason: Change-Id I06aa9df929abb94f1d9354f57087a973be597a43 with SHA-1 af3da459b7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica36deee81051725bfe9982a2f44d7ff4d8de782