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

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

Change-Id: I4001a7a360bc7f9b69ffdceafd8bd854afcdbf99