Merge "fix testUserRestrictionsSetOnParentAreNotPersisted failure" into android11-tests-dev