Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4...

Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4 am: e67182e5 am: d0a92ee2 am: 3906ff83

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

Change-Id: I34def8bd8ec9e16aac4cafc7ecb64eb532aea930