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

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

Change-Id: Ic85ef17fef82b055380dce40bc88678f8109b25f