Merge "Support PersistableBundle type config values in getConfigByComponentForSubId"