Merge "fix pfw criteria generator on S" am: 981864736a am: f0b2262dca am: 6950539251

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c50d1cc993c1d7b5690ee06f247382b1bea4c0