Merge "Restructuring of AAID using aidl_interface build system." into main am: 1cafb8a7b2 am: b4c2766158 am: 163336f273

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

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