Merge "Remove packagemanager_aidl from export_shared_lib_headers" am: 5f9346dc35 am: 69c5a29603 am: 0470e9c2c5 am: 301c602bf7 am: 6b19149df3

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

Change-Id: I41b58b594821cc7667c60fcad28d0f95ea779db0