Merge "Fix -Wbitwise-instead-of-logical" am: 891c19ccfa

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

Change-Id: Ibbb98e2355123bb745d73aa5303421bc7f630268