[automerger skipped] Remove stale aidl-export references am: d386543a -s...

[automerger skipped] Remove stale aidl-export references am: d386543a -s ours am: db05a438 -s ours am: abd2ee71 -s ours am: a26b703d -s ours

am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042694



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