[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: e80c1eec -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: e80c1eec -s ours am: f1b1fbc4 -s ours am: 638896b7 -s ours am: 555d6616 -s ours

am skip reason: subject contains skip directive

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



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