Merge "Add system API to PersistentDataBlockManager to return config_persistentDataPackageName"