Snap for 7189849 from a98bafcb287d5df7fcd411c11ca5438ecdea563f to sc-release am: 66118ce521

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxaac/+/13797182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id11ef2e273e1346e76b92dc5692c7ec7b7ce6e28