Merge "Move AIDL files to declared packages." am: 1f125fcd am: 66f6e3d7...

Merge "Move AIDL files to declared packages." am: 1f125fcd am: 66f6e3d7 am: 89d60ad6 am: e143e071

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

Change-Id: I089b2f50a38e05c785de35b41363b809c823caa7