Merge "Remove PersistableBundle.aidl from Java framework"