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

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

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