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

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

Change-Id: Ie455e418f1f98d2dc91c640ec9bc127da92e9559