[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 skip reason: Merged-In I9b90f8cdb04f4b96bb8b26eb60db6b842481fca1 with SHA-1 8d6bdd10 is already in history

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



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