Merge "Add PersistableBundle ndk and AIDL type" into main am: 897c6c6751 am: 81796b62a5

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

Change-Id: I7a695f04845a7dbae2b95aaf88dcc2730d5fb8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>