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

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

Change-Id: Id750c814141141132e28150c341239b4ce64cd32