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

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

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

Change-Id: I01ac2097abdeb1f993811b4e4b5610a7a96713b0