Merge "Address [set|get]RestrictedAllowedApps API review feedback"