Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4d7 am: e67182e502

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

Change-Id: I68844967fbef3cffb7211ce72fd502ae19c331c8