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

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

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