[automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: ff30f705 -s ours am: f6d6a800 -s ours

am skip reason: Merged-In I20e61b431eed267995fcd3c33cd1d62b2c9e29b5 with SHA-1 6e2a8132 is already in history

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

Change-Id: I7da0239a0057753533ddcd673c7704afd9ca202b