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

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

Change-Id: I76bd57f68b3043716c8358b17d52d38a0011c89a