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

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

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb