[automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e am: 3719bd9c -s ours am: f73a22aa -s ours am: 1b2341bd -s ours am: 9736e62f -s ours

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

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

Change-Id: Ida2a0b3f7b028939cb3e68cd7594c1f78eb875df