Merge "Move AIDL files to declared packages." am: 1f125fcd66 am: 66f6e3d77e

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

Change-Id: Ibb810b6c18f3951679092072fc9f587acd7cf660