Merge "libbinder: prepare extradition of pm AIDLs" am: ca5d526aa3 am: 9d08d10c9e

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

Change-Id: Ib0a6bbc74c3427a5e6c4f431eb3c7d20bf201e83