[automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 am: 3719bd9cd0 -s ours

am skip reason: Change-Id Idc2acb28ac0475ee69385487c7ef619951f93516 with SHA-1 e5bd46e639 is in history

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

Change-Id: I10acf31ada3afd4bc7f1b413a441eb278db7c5fa