Merge "Create dedicated long variables." am: 78106c0ea4 am: dbca2d9a1f am: 742e35e203

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

Change-Id: I872014db65c9f1d1b1cfc0c9c6fb338fb0b3917f