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

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

Change-Id: I262ee94fd28502a97a97016f12398b98566446fe