[automerger skipped] Merge "Create a framework.aidl for non-updatable...

[automerger skipped] Merge "Create a framework.aidl for non-updatable platform" am: ad14580f am: 15f6d767 -s ours am: 451b5533 -s ours

am skip reason: Change-Id I224117a0ff695c22d4a4317a51a9b775ed73066b with SHA-1 85c151c3 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324606

Change-Id: Ia8e0d5fc701d35ccf03d37518a500b672f762f7d