Merge "Revert "Make DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_..."" into main