Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 am: 665796dd6d am: bdd7c5eb53 am: 138c4fe4bc

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

Change-Id: I7cbc2ef02aa2b6f235d6a63aa008f9764188f30d