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

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

Change-Id: I6bdf801eb861e3d87179a5f9d3f22883a237ca93