Merge changes from topic...

Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev am: 03ce6c74 am: 34072de0 am: bce1a24a am: 93be9f97

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



Change-Id: I57740d8a5848ded68e0b625aa10e42bead0d3d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>