[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is...

[automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: f13ee0d0 am: 8c8ba93a am: 959407b2 -s ours am: 40b952e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I04b1d59e6d8ffc7a046231413eb6a1de79220c3e