Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c" into qt-dev-plus-aosp am: 3f176785 Change-Id: Idd5f4618e6fdb73121ba2746bee91636fece7241