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

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

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb