Merge "aidl PersistentSurface: remove unnecessary definitions" into main am: 784abf6846 am: 374885fe9a

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

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