Merge "Decouple User Sensitive update from grantOrUpgrade in Policy Service" into main