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

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

Change-Id: I3e4743aabc09f9a8f360f61661cb0cd4ec65f453