Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0...

Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0 am: c644182c" into rvc-qpr-dev-plus-aosp am: 684c4218

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653203

Change-Id: Ib4f30b4f32a62fbeb982a183fca9b1c4e130e37f