Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev