Merge "Remove packagemanager_aidl from export_shared_lib_headers" am: 41838e39d6

Original change: https://android-review.googlesource.com/c/platform/system/iorap/+/1842427

Change-Id: I125d58f1ad58a53011840b9d8d8a4ea8088b6aef