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

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

Change-Id: I83984128124b3272c5ebfa0693d7102fc88f4c13