Merge "Fix && used in place of &" am: c4b8e37802

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

Change-Id: I54faffff2d9f8be781b73f263ef1cb2588f62034