[automerger skipped] media c2.aidl: PersistentSurface related aidl defs &...

[automerger skipped] media c2.aidl: PersistentSurface related aidl defs & impls am: b48b5aff am: 7b046f88 -s ours

am skip reason: Merged-In I61aa0bcb82344430ca7e828624f3cfbf7d888af8 with SHA-1 fb8c5ed0 is already in history

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



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