Merge "Fix -Wbitwise-instead-of-logical" am: 891c19ccfa am: 2b2cd75db3 am: 9da5ced2e3 am: acea76dd25

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1964945

Change-Id: I908773cafb9064dacb2e451d478335dbb8dbf385