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

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

Change-Id: I1a56e7e0c2052ccd6ab6fb9316aabfc4b97f4e2b