Merge "Add a flag to cache hasUserRestriction to avoid unnecessary binder calls." into main