Merge "Remove packagemanager_aidl from export_shared_lib_headers" am: 5f9346dc35 am: 69c5a29603 am: 0470e9c2c5

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

Change-Id: Ic3b94afd5b652944bfc6cb652c4738a4822dec65