Merge "Remove packagemanager_aidl from export_shared_lib_headers" am: 4b59a0b58f am: 8d91174714

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1842424

Change-Id: I5ef7f4ac861a7708b974dcb3962392c2b2f4fb7c