[automerger skipped] Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 am: d40462e66d -s ours am: bd491fffc7 -s ours

am skip reason: Change-Id I1ab977248b1c39a7d08e0ca34389a7ba168c05b0 with SHA-1 95dd53bb5f is in history

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

Change-Id: Iecc0621243ba7bef779923f3fe4f46f8fc366342