Merge "Remove packagemanager_aidl from export_shared_lib_headers" am:...

Merge "Remove packagemanager_aidl from export_shared_lib_headers" am: 5f9346dc am: 69c5a296 am: 0470e9c2 am: 301c602b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1842813

Change-Id: I27a9ddc52693d80595b51c0a6557b02d03c07bb2