Merge "Create dedicated long variables." am: 78106c0ea4 am: dbca2d9a1f am: 742e35e203 am: 2afff12071 am: 8ec2e93056

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

Change-Id: Ic3ec1ccf1b0e250ec54f2105475164de77a78c1a