Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1

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

Change-Id: I2c4c1d618174fef1a08cca712e259878719c13c4