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

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

Change-Id: Ic3fbab8ee074d96b4d02ee815398e128bca180c8