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

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

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