Merge "Fix -Wbitwise-instead-of-logical" am: 11addfade5

Original change: https://android-review.googlesource.com/c/platform/external/clang/+/1971006

Change-Id: I7216395a9a2514f131fb6a04f368ea77bd81ce9f