[automerger skipped] Undo aidl-freeze-api for diverged interfaces am: 070d1b1a94 am: ed9e70c52e -s ours

am skip reason: Merged-In Ibff72bad06fbc92e6f26854f7218a23b89bace19 with SHA-1 9df02453a1 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3454362

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